Ubuntu
python-support package

Merge lp:~barry/ubuntu/natty/python-support/py27 into lp:ubuntu/natty/python-support

  1. Natty (11.04)
  2. py27
  3. Merge into natty
Proposed by Barry Warsaw
Status: Merged
Merge reported by: Scott Kitterman
Merged at revision: not available
Proposed branch: lp:~barry/ubuntu/natty/python-support/py27
Merge into: lp:ubuntu/natty/python-support
Diff against target: 43 lines (+9/-3)
3 files modified
debian/changelog (+6/-0)
pysupport.py (+1/-1)
tests/testparseversions.py (+2/-2)
To merge this branch: bzr merge lp:~barry/ubuntu/natty/python-support/py27
Reviewer Review Type Date Requested Status
Clint Byrum (community) Needs Fixing
Matthias Klose Pending
Ubuntu branches Pending
Review via email: mp+38965@code.launchpad.net

Description of the change

Add Python 2.7 support.

To post a comment you must log in.
Revision history for this message
Clint Byrum (clint-fewbar) wrote :
Download full text (5.0 KiB)

I applied this patch to my local system, and the python-cheetah build does create the .deb correctly now, but update-python-modules does not seem to byte compile the modules for python2.7 during postinst.

I will attach the output of running 'update-python-modules --verbose -f' to the bug report. Here is an ls of /usr/lib/pymodules/python2.6 vs. /usr/lib/pymodules/python2.7:

clint@ubuntu:/mnt/clint/merges/cheetah-deb/cheetah-2.4.3$ ls /usr/lib/pymodules/python2.6
apt_xapian_index-0.39.egg-info deb822.pyc M2Crypto-0.20.1.egg-info parsedatetime rrdtool.so
axi debian magic_d.so parsedatetime-0.8.7.egg-info simplejson
boto debian_bundle Magic_file_extensions-0.1.egg-info pssh-2.1.1.egg-info simplejson-2.1.1.egg-info
boto-1.9b.egg-info dulwich magic.so psshlib SOAPpy
cairo dulwich-0.6.2.egg-info markdown pychart SOAPpy-0.12.0.egg-info
Cheetah fpconst-0.7.2.egg-info Markdown-2.0.3.egg-info PyChart-1.39.egg-info stdeb
Cheetah-2.4.3.egg-info fpconst.py mercurial pygments stdeb-0.6.0.egg-info
clb fpconst.pyc mercurial-1.6.4.egg-info Pygments-1.3.1.egg-info twisted
clb-0.4.1.egg-info gearman moin-1.9.3.egg-info pygtk.pth ubuntu_dev_tools-0.104.egg-info
configobj-4.7.2.egg-info GnuPGInterface-0.3.2-py2.6.egg-info MoinMoin pygtk.py ubuntutools
configobj.py GnuPGInterface.py MySQLdb pygtk.pyc validate.py
configobj.pyc GnuPGInterface.pyc _mysql_exceptions.py pyOpenSSL-0.10.egg-info validate.pyc
dbus gtk-2.0 _mysql_exceptions.pyc py_rrdtool-0.2.1.egg-info wadllib
dbus_bindings.py hgext MySQL_python-1.2.2.egg-info python_debian-0.1.16ubuntu1.egg-info wadllib-1.1.4.egg-info
dbus_bindings.pyc jabberbot _mysql.so python_libgearman-0.13.2.egg-info werkzeug
_dbus_bindings.so launchpadlib OpenSSL reportbug Werkzeug-0.6.2.egg-info
_dbus_glib_bindings.so launchpadlib-1.6.2.egg-info paramiko reportbug-4.12.6ubuntu1.egg-info ZooKeeper-0.4.egg-info
deb822.py ...

Read more...

review: Needs Fixing
Revision history for this message
Barry Warsaw (barry) wrote :

Okay, I built python-support with py2.7 enabled in the ~pythoneers ppa, then I built the latest cheetah in a dependent ppa. I installed both on a natty VM and afaict, everything worked as expected. 'import Cheetah' worked for both python2.6 and python2.7, gave expected paths, and update-python-modules seemed to work too. I am going to find a sponsor to upload the new python-support and python-central. We'll fix failures as we go.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-10-13 17:10:04 +0000
+++ debian/changelog 2010-10-20 18:17:42 +0000
@@ -1,3 +1,9 @@
1python-support (1.0.10ubuntu2) natty; urgency=low
2
3 * Add support for Python 2.7. (LP: #664068).
4
5 -- Barry Warsaw <barry@ubuntu.com> Wed, 20 Oct 2010 14:15:18 -0400
6
1python-support (1.0.10ubuntu1) natty; urgency=low7python-support (1.0.10ubuntu1) natty; urgency=low
28
3 * Merge with Debian; remaining changes:9 * Merge with Debian; remaining changes:
410
=== modified file 'pysupport.py'
--- pysupport.py 2009-11-18 19:55:19 +0000
+++ pysupport.py 2010-10-20 18:17:42 +0000
@@ -1,7 +1,7 @@
1import os1import os
22
3# Do not get the version list from pyversions, it isn't reliable3# Do not get the version list from pyversions, it isn't reliable
4py_supported = ['python2.6']4py_supported = ['python2.6', 'python2.7']
5py_installed = [ ver for ver in py_supported if os.access('/usr/bin/'+ver,os.X_OK) ]5py_installed = [ ver for ver in py_supported if os.access('/usr/bin/'+ver,os.X_OK) ]
6py_supported_short = [ a.replace("python","") for a in py_supported ]6py_supported_short = [ a.replace("python","") for a in py_supported ]
7py_oldversions = ['python2.1','python2.2','python2.3', 'python2.4', 'python2.5']7py_oldversions = ['python2.1','python2.2','python2.3', 'python2.4', 'python2.5']
88
=== modified file 'tests/testparseversions.py'
--- tests/testparseversions.py 2010-03-11 23:17:19 +0000
+++ tests/testparseversions.py 2010-10-20 18:17:42 +0000
@@ -13,10 +13,10 @@
13 return output13 return output
1414
15 def test_regular(self):15 def test_regular(self):
16 self.assertEqual(self.get_output('testparseversions.regular.control'), '2.6\n')16 self.assertEqual(self.get_output('testparseversions.regular.control'), '2.6 2.7\n')
1717
18 def test_leading_newline(self):18 def test_leading_newline(self):
19 self.assertEqual(self.get_output('testparseversions.leading-newline.control'), '2.6\n')19 self.assertEqual(self.get_output('testparseversions.leading-newline.control'), '2.6 2.7\n')
2020
21 def test_missing(self):21 def test_missing(self):
22 self.assertRaises(RuntimeError, self.get_output, 'testparseversions.missing.control')22 self.assertRaises(RuntimeError, self.get_output, 'testparseversions.missing.control')

Subscribers

People subscribed via source and target branches

to all changes: